Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 16:57:06 +0000 (19:57 +0300)
committerEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 16:57:06 +0000 (19:57 +0300)
commitb4264f5ea74eb82f79d2c1959937d0ac0a3b252a
tree141190c94cb2fb945b3ca2cb6a1a2b6ecd86b4a8
parent957cc116d61d2bff9d028d41afdb326b460438d9
parent9b16efdb9757110aeda6b98f4ce29f12295f7372
Merge from trunk.